diff --git a/device-common.mk b/device-common.mk
index 12312bd..4da1c08 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -23,6 +23,9 @@
 # Set custom settings
 DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
 
+#Force navkeys on
+PRODUCT_PROPERTY_OVERRIDES += qemu.hw.mainkeys=0
+
 # Add openssh support for remote debugging and job submission
 PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh